gcj-safe-jni-h-include
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Wed, 1 Aug 2012 08:41:17 +0000 (08:41 +0000)
committerRene Engelhard <rene@debian.org>
Wed, 1 Aug 2012 08:41:17 +0000 (08:41 +0000)
Gbp-Pq: Name gcj-safe-jni-h-include.diff

configure.in
set_soenv.in

index 0db6452e63f4a67226e5f52886ed896eafec3fc1..a5032339b3e7e9b09f7ab1b17c3a46961e9557d6 100644 (file)
Binary files a/configure.in and b/configure.in differ
index e3d48a18e672ef258440e7f3f6ffc387645d520e..57927a029970675186622ca4238beef52cc09ea9 100755 (executable)
@@ -1311,6 +1311,10 @@ if ($platform =~ m/solaris|linux|freebsd|netbsd|aix|openbsd|dragonfly/ && '@CROS
 
         $SOLARINC .=$I.$JAVA_HOME.$INCLUDE.$ds."native_threads".$INCLUDE;
        }
+        if ($JDK eq "gcj")
+        {
+                $SOLARINC    .= $I."@GCJ_JNI_INCLUDE@";
+        }
     #The tail, if needed
     if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd|dragonfly/)
     {  if ( $XINC ne "/usr/include" && $XINC ne 'no_x_includes' ) {